Removed unneeded ifdef