Removing dependancy on closurelibrary