Code cleanup - removed variables which are not actually used for anything