Documentation, extraneous/defunct functions removed