A lot of cleanup, more is still needed
Removing all non core modules