removed some legacy pieces of code