Removed unscalable Object functions and consolidated Objects