clean up, remove unnecessary extern declarations