Remove old utils-module
Add missing record-name
Documentation and better code