Cleaned out code related to obsolete unit activities

Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>