Remove fixme + some unused code