Feature/elehack 2.1 cleanups