removed parts of old code