Clean up

API and ASP.NET Clean up