Forum action cleanup

This should probably be in ems