Removed useless if's
merge fix