removed unwanted code and commented out some other things