[Cassie] - cleaning up some code