Remove wrong returns