More fixes

removed not needed variables