Get rid of initial test code