FB 1. clean up