Clean up feature layer api