remove duplicate symbols + some cleanup by smichr