remove useless crap
pull this class out into its own file