Cleaned out/up remaining Mirror b.c. portions