Removed debug lines - need tests