Cleaning up code, removed other unnecessary code
deleted other pages
deleted and removed merge issues