Removed dead code / copied code