Updates for 2.1-RC2
Clean imports
Update to deadbolt