API Fish Clean Up & Maintenance