removed needless function