some cleanup after adding fk annotations