Trash removal

Cleaning up some code...