removing some unneeded stuff