Removal of test code :)