removing sweaver dependency (for now)