Cleanup for private usage