Added another remove EVK hook to cleanup
Bugfix