code cleaning.. artefacts remainig