Removed old non-used funct