Removing test-code