Clean up unused/unnecessary code.