cleanup/2014 edits