Work In Progress
  Removed Dead code
  Addded a few @Suppress annotations for command processing methods
  Cleanup