polish layout and usability remove unused code