Fix master branch.Fix .idea/workspace.xml and remove some stuff from helpers