removed some extra parts