Some cleaning out of old code. Replaced "trunk" code with pristine code
from Young Yun