Code cleanup, no new features