Removed clutter from VC