Removed some extraneous functions and some minor cleanup