Clean up unused requires and variables