Removed unused class
volcanoes and some cleanup
Merge commit