cleanup code and add guardedby annotations