Remove more unnecessary twigils code