Fixed cake and delete useless junk