fix require
cleanup