Remove unnecessary things due to #34