Clean up offline additions and add comments