refactor user splash handling
wip
remove unneeded code