fixed lint and checkstyle issues
removed workaround with empty activity