clean up - removed comments