Cleanup of old, unused code