Updated and Clean up of unwanted code