removed some left overs