More tree clean-up

Math is broken again, will fix

Signed-off-by: Alec Ari <neotheuser@ymail.com>