removing old code, cleanup.