Cleaned Main instance related things