Added Lingor + Cleanup