removed redundant code ffrom last commit