Removed unnecessary setup items per feedback