adding martin of course
getting rid of unused crypto lib