Removed class files, minor changes
Switched to 2.3.3