Clean up.
Task #27