Rmoved 2 unused vars from old implimentation