Clean up extra data