More code clean up.
More code clean up.

honestegg/cassette,damiensawyer/cassette,BluewireTechnologies/cassette,damiensawyer/cassette,andrewdavey/cassette,andrewdavey/cassette,andrewdavey/cassette,honestegg/cassette,damiensawyer/cassette,honestegg/cassette,BluewireTechnologies/cassette