Cleaned upped obsolete code and auto xml comments