Clean up as well as integration with New Api