Remove crutch code