Removed unnecessary bits and pieces to make CI easier