Removed duplicate stuff accidentally added during merge