Removing takelast usage of takelastbuffer