Cleanup unnecessary code
[Temporary commit]preparing for weekend