removing pointless headers
more refactoring