removed unneeded code, general clean up