refactor; remove unnecessary cuts