Revert "Cleaned up code and flag model is now removed on flag drop"

This reverts commit 52b2566ddb0f2110c40b500fb4ef019c4be146fd.