Working on #30. Removed the optimizelegibility code as it's not valid or useful