- unused lines removed
- belongs to #82, #73 and #69