Removed unused imports, and moved select area to _old