Removed custom collections & dictionaties