Clean up and removing unnecessary changes