Cleaned up

Removed things i will likely never use and renamed a few mixins