Merge "Remove unused rollback module"