Cleaned up some unused vars and imports