Removed unused class, cleaned-up some code