add comments
rm obsolete lockserver