Remove base and extended limits for now