cleanup of now unused methods