Remove app class from code