Cleaning up Adapter