Clean up linear space declarations