Feature/jp remove old code