Got rid of a ton of excess code