Cleaned out unnecessary stuff