Removed unnecessary Error messages and calls to Setup
Added comment for getter