Removed unnecessary import
Merged changes