remove unnecessary rubocop incudes and fix deprecated syntax