small cleanups

clean up includes
remove unneeded declarations