more refactoring
removing unneeded stuff