Remove unwanted code..