Getting rid of testing code.