Fix issue #139 and remove some functions

2 jobs for !21 with brightness-improvements in 2 minutes and 31 seconds (queued for 3 seconds)
latest merge request