Pull out unneeded declarations
Remove comment