cleaned up unneeded functions, text edits