Even more spring cleaning

Signed-off-by: jdalphon <jdalphon@jdalphon-dev.(none)>