Some BlockedLoaction adds and old code removal.