Remove temporary ApiNonStatic class as Api is now refactored