cleanup and placeholders added