Code cleanup (unnecessary include lines, etc)