1.5 update

Updated for 1.5 and removed unused imports (for some reason wrote 1.5.1, I fail)