Cleanup some Codes

Commenting out unused codes, move things around. Tested locally, and
working.