worked on remove code helper methods