Shaving the rough edges