Code clean up

All unused items were removed