Removed the god-awful objects that were previously used