Clean up on SD code
Unify the configs