Removed static dependencies