Clean up extra stuff