Removing SP stuff