Cleaned up more, before removing autopublish