remove old comments and fix requires