Removed recursive functions