Adjustments for new action files; removal of content type