Removed many things in preparation for adding other things