Remove test code from main class