~ got rid of some unless code

Signed-off-by: Imkerix <Imkerixus@gmail.com>