Clean up implementation