removed crapl remnants