removed a buncha stuff