Cleanup for easy integration