Removed servlet dependency