Cleaned Up

Removed unnecessary class