Removed obsolete methods and fixed listings