Feature/420 kill globals