Normalized code and removal of attachments + raw files