removing some spaghetti