Comments and temp code cleanup