remove whitespace
minor code cleanup
remove Tag relation. It happens in the Behavior.