Remove redundant keep files and add utilities classes.