worked on remove code some more