remove unnecessary things from commit 885b506