Delete out company list, make companies property and delete out ifelse logic