Removed test code, restored default functionality