Remove for Version 1.7