remove unnecessary stuff
fix