removing some things as well