Remove unnecessary code
Fix abort problem...oops