Clean up based on new documentation