Removed the manual collections implementation