[COMMIT] Remove some redundant functions, change others to labels, lisp/