Remove Unneeded and Decieving continue and other simplifications