clean up and move out things from other.mss