Add comments and disable obsolete functionality