Minor bug fix.

Removes unnecessary code, and adds inventory interaction checking.