Code cleanup, out-comments unused functions