cleanup
Merge pull request #1 from runephilosof/localavail

cleanup
Resolved merge conflict with core