Debug code Cleanup. Few Testing functions.