Removed unnecessary modules &improved performance