Fix stack overflow exception

@aaustin 
clean up these