Removed some contrib remains.