Small update - Clean up endpoints