cleaned up unused classes #112