Minor code cleanup, remove accidentally committed test