Mostly cleanup. Also a minor fix/optimization

Removed relic code and I found something that wasn't so bright... it
didn't cause any error but now it should be ever so slightly faster.