remove unused methods, batch saves for speed