Removed Unused Objects + Small Change