Forgot to remove Adapter-related code