Removed unnecessary Prepare() calls