Cleaned up a few placeholder things.