Removing most of old implementation.