Updating to remove comments (for now)