Maint/cleanup spec already initialized warnings