Remove unused methods, logging and add -f option.