Cleaning up SPL