Removing legacy code completely