Removed unnecessary pieces.