Removing EVEFrameLocks and cleaning up code in general