Cleaned up user catalog functions.