Cleaned up some class and field names and remove unused code