Removed some more unused code
Reverted back to class names