Cleanup; fix some warnings
Delete deferred feature init