Removed the strange test code for the moment.