Remove a lot of not used code.