Removed redundant reference and usings