Code cleanup, restored VS Debug project