removed swap things