[MD]: minimal cleanup