Removed some left overs