Cleanup - Get rid of some unneeded SP garbage ..