[z2334] fix nightfall/shadow trance and remove obsolete code

Signed-off-by: Salja <salja2012@hotmail.de>
Merge branch 'master' into testing