Removed wierd if statement