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