removing unecessary dependencies and classes