Cleaned away junk code.