removing some unused icons and code