model: remove unnecessary methods, add comments, WIP