Cleaned up async classes