Removed needless ifdef