Cleaned out a lot of old huashan code