Clean up code, remove unused code.