deleted xml parsing class files, tidied code