Removed location classes, now no longer used.