Cleaned up, deleted junk code, yadayada