Clean up unused declarations