Cleanup
Refine develop mode
Use specs from alley_common