Cleanup vestigial code