Cleanup for consistency