Removed nooby dead code