Issue #29. Removed the leftovers.