removing some left over variables