#74 - Clean up