Clean up primitive implementations