Spring classes removed for redundancy