Code cleanup completed, final debugging left