Updated for 1.5.1

Updated for 1.5.1 and removed unused imports