last of the code clean up for now