temporarily fixed the edit and remove problem (static method reference. needs to be changed eventually - this is a temporary fix)