Initial Import [2/2] remove unwanted code