Clean up declarations