trying to clean up code, to trim unneeded code