removed unnecessary imports
Merge branches 'master' and '2014.03.21.0355'