Clean up the adapter idea