Cleaned out unnecessary code