Cleaned up redundant import statements
Merge with laptop
Merge with laptop