removed some c&p artifacts