Simplified scope and removed development shims