Moved more code from sp into core module
Updated core submodule reference
Cleaned up

Removed unused code