Useless things removed, slight interface modifications, etc