simplify destroy method
tidy up includes