Removing static classes