Removed list usage