Removed code that is not useful anymore and commented out