Clean stack

This partially addresses #4