Some cleaning, worked on file re-publish