Clean up messy code
Remove unneeded class
Increase version