Charlie - Removed some clutter