Core/Objects: Removed obsolete code