Unnecessarry code removed