Cleanup of some unused methods