Comment out some things which are unused by me (at least for now)