cleanup - remove unneseccary stuff