remove and clean code