Clean up code #1104