Moving to a simpler way to track free space
removing validation