Issue #56 in progress and remove an unused div