mas cleanup

final where we see little lightbulb
removed extra imports