remove unused headers, cleanup