remove unused fiels, unecessary line of code