Clean up stray declarations