Cleaned up some core code so it will start up quicker!
Cleaned up the core code Imports!