removing unused components
more refactors