Removal of testing code