Cleaning unneeded code