Remove RDS management functions.
Fix naming conflict.