Clean up the main class, remove async update timer