Cleaned up various things
Moved more necessities to core