Final features before release
Remove old code