removed shiro class and unnecessary id's