Some clean-up

Signed-off-by: SharplEr <sharplermc@gmail.com>