[WIP] Remove asterisks