eliminated a lot of unused code including comments