MainActivity cleanup