remove need for fixmate
simplify commands
cleanup