Deleted dead code & other clean-up items