Removed unsed classes + some re-naming