More Cleanup of old functions