rm'd some deprecated interfaces