Moved back from less. Doesn't work on windows
Cleaned up resources