Delete 'ed', 'room' and 'dribble' because they look useless.
Move cl21.core.util -> cl21.internal.util.