Import cleanup and some work done on service layer