remove new unused stuff and new navigation drawer