Remove some trash from code.
merge