Code cleanup, still no progress