Cleaning up code. Removing Sponge references from core code