Moved to top, and also remove warehouse