Clean up a bit, remove unused class